gtkcontainer: Add _gtk_container_*_need_resize internal accessors

gtkoffscreenwindow and gtkwindow need access to need_resize var

diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index afd2315c7c1a3d082f4f6161ebf621d4c60572e4..2ce2b4f155e4d76845247fa32b09987de79d00c1 100644 (file)
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -2683,3 +2683,16 @@ gtk_container_propagate_expose (GtkContainer   *container,
       gdk_event_free (child_event);
     }
 }
+
+gboolean
+_gtk_container_get_need_resize (GtkContainer *container)
+{
+  return container->priv->need_resize;
+}
+
+void
+_gtk_container_set_need_resize (GtkContainer *container,
+                                gboolean      need_resize)
+{
+  container->priv->need_resize = need_resize;
+}

diff --git a/gtk/gtkcontainer.h b/gtk/gtkcontainer.h
index a1c3a520680f299df292cb461b6e3bb62e92659c..bb4f5469bf0e7cdcfa2ee36064a4bc85fa6dd026 100644 (file)
--- a/gtk/gtkcontainer.h
+++ b/gtk/gtkcontainer.h
@@ -208,7 +208,9 @@ GList *_gtk_container_focus_sort             (GtkContainer     *container,
                                              GList            *children,
                                              GtkDirectionType  direction,
                                              GtkWidget        *old_focus);
-
+gboolean _gtk_container_get_need_resize      (GtkContainer     *container);
+void     _gtk_container_set_need_resize      (GtkContainer     *container,
+                                              gboolean          need_resize);
 
 G_END_DECLS
 

diff --git a/gtk/gtkoffscreenwindow.c b/gtk/gtkoffscreenwindow.c
index 7e05fcb04952f3dfad001839873f531732f0635a..417003b8fc734eab57eeb9ab686eafe9d9f39f09 100644 (file)
--- a/gtk/gtkoffscreenwindow.c
+++ b/gtk/gtkoffscreenwindow.c
@@ -184,8 +184,8 @@ gtk_offscreen_window_show (GtkWidget *widget)
   GTK_WIDGET_SET_FLAGS (widget, GTK_VISIBLE);
 
   container = GTK_CONTAINER (widget);
-  need_resize = container->need_resize || !gtk_widget_get_realized (widget);
-  container->need_resize = FALSE;
+  need_resize = _gtk_container_get_need_resize (container) || !gtk_widget_get_realized (widget);
+  _gtk_container_set_need_resize (container, FALSE);
 
   if (need_resize)
     gtk_offscreen_window_resize (widget);

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 1ef066c2afe5a72d4268309dd0624fb75a6ad249..e5ee01ca0c10ae08979a808ea16c9c3da998320c 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -4464,8 +4464,8 @@ gtk_window_show (GtkWidget *widget)
 
   GTK_WIDGET_SET_FLAGS (widget, GTK_VISIBLE);
 
-  need_resize = container->need_resize || !gtk_widget_get_realized (widget);
-  container->need_resize = FALSE;
+  need_resize = _gtk_container_get_need_resize (container) || !gtk_widget_get_realized (widget);
+  _gtk_container_set_need_resize (container, FALSE);
 
   if (need_resize)
     {